Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Jul 2010 22:44:54 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Jul 2010 22:44:54 +0000 (22:44 +0000)

Trivial merge